dbeaver/pro#7562 [CB] keep data editor filter state during session - #4261
Merged
devnaumov merged 45 commits intoApr 22, 2026
Conversation
allow using attrName without attrPosition
replaced private restorePendingState() with public restoreViewState(pinnedColumnNames, columnOrderNames?) that takes data directly as arguments
bug with skipping constraints if any without a position.
if (!prevColumn) {
return;
}
… in GridViewAction
…of github.com:dbeaver/cloudbeaver into 7562-cb-keep-data-editor-filter-state-after-reconnect
… centralized state persistence
…LDataFilter" This reverts commit 3e0e86f. Last test showed that we don't need any additional logic on BE. It handles all constraints properly.
Up to standards ✅🟢 Issues
|
| Metric | Results |
|---|---|
| Complexity | 0 |
NEW Get contextual insights on your PRs based on Codacy's metrics, along with PR and Jira context, without leaving GitHub. Enable AI reviewer
TIP This summary will be updated as you push new changes. Give us feedback
Wroud
suggested changes
Apr 11, 2026
…DatabasePersistedStateStore and update related references
…f github.com:dbeaver/cloudbeaver into 7562-cb-keep-data-editor-filter-state-during-session
Wroud
reviewed
Apr 14, 2026
Comment on lines
+47
to
+64
| private applyPersistedConstraints(): void { | ||
| const options = this.source.options; | ||
|
|
||
| if (!options || !validatePersistedState(this.store)) { | ||
| return; | ||
| } | ||
|
|
||
| if ('constraints' in options && 'whereFilter' in options) { | ||
| options.constraints = this.store.constraints.map(c => ({ | ||
| attributeName: c.attributeName, | ||
| operator: c.operator, | ||
| value: c.value, | ||
| orderAsc: c.orderAsc, | ||
| orderPosition: c.orderPosition, | ||
| })); | ||
| options.whereFilter = this.store.whereFilter || ''; | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
please move to result set data source
Comment on lines
+344
to
+351
| for (const name of pinnedColumnNames) { | ||
| const key = this.columnKeys.find(k => this.getColumnName(k) === name); | ||
|
|
||
| if (key) { | ||
| this.pinnedColumns.add(GridDataKeysUtils.serialize(key)); | ||
| } | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
i will suggest to move validation logic for pinned columns and columns order to the updateResult method
| ps.set(COLUMN_ORDER_KEY, isCustomOrder ? columnNames : []); | ||
| } | ||
|
|
||
| restoreViewState(state: IRestoreViewState): void { |
Contributor
There was a problem hiding this comment.
try to use direct states from store instead of syncing private properties with state
| return this.result.data?.columns?.find(c => c.position === colIdx)?.name; | ||
| } | ||
|
|
||
| private persistConstraints(): void { |
Contributor
There was a problem hiding this comment.
we need to persist datasource options object (whereFilter) maybe it will be better to persist constraints in the same place instead of splitting it across classes
- DatabasePersistedStateStore: pure KV (observable.ref + actions) - DatabaseDataSource: add loadPersistedState() + onPersistedStateLoaded() hook - DatabaseDataConstraintAction: own the constraint persist - ResultSetDataSource: thin dispatcher - GridViewAction: columnsOrder/pinnedColumns become computed getters
…ards, simplify persisted data filter state handling
…g and layout resolution
…op constraint persistence hacks
…ss implementation
Wroud
previously approved these changes
Apr 20, 2026
| executionContext: observable, | ||
| }); | ||
|
|
||
| this.persistConstraintsDisposer = autorun(() => persistDataFilterConstraints(this)); |
Contributor
There was a problem hiding this comment.
i will recommend to initialize it after applyPersistedDataFilterConstraints(this); to avoid collisions
but honestly this is bad that we use DatabaseDataConstraintAction in the DataSource (it was so before you changes, but now there is more dependencies on it)
Member
There was a problem hiding this comment.
The separate ticket will be created for this and bellow comments
Comment on lines
+42
to
+57
| const options = source.options; | ||
| if (!options) { | ||
| return; | ||
| } | ||
|
|
||
| const constraints = source.persistedState.get<SqlDataFilterConstraint[]>(CONSTRAINTS_KEY); | ||
| const whereFilter = source.persistedState.get<string>(WHERE_FILTER_KEY); | ||
|
|
||
| if (!Array.isArray(constraints) || typeof whereFilter !== 'string') { | ||
| return; | ||
| } | ||
|
|
||
| runInAction(() => { | ||
| options.constraints = constraints.map(constraint => ({ ...constraint })); | ||
| options.whereFilter = whereFilter; | ||
| }); |
Contributor
There was a problem hiding this comment.
how about:
Suggested change
| const options = source.options; | |
| if (!options) { | |
| return; | |
| } | |
| const constraints = source.persistedState.get<SqlDataFilterConstraint[]>(CONSTRAINTS_KEY); | |
| const whereFilter = source.persistedState.get<string>(WHERE_FILTER_KEY); | |
| if (!Array.isArray(constraints) || typeof whereFilter !== 'string') { | |
| return; | |
| } | |
| runInAction(() => { | |
| options.constraints = constraints.map(constraint => ({ ...constraint })); | |
| options.whereFilter = whereFilter; | |
| }); | |
| const constraints = source.persistedState.get<SqlDataFilterConstraint[]>(CONSTRAINTS_KEY); | |
| const whereFilter = source.persistedState.get<string>(WHERE_FILTER_KEY); | |
| if (!Array.isArray(constraints) || typeof whereFilter !== 'string') { | |
| return; | |
| } | |
| source.setOptions({ | |
| ...source.options, | |
| constraints: constraints.map(constraint => ({ ...constraint })), | |
| whereFilter | |
| }); |
Comment on lines
+360
to
+361
| source.options!.constraints = []; | ||
| source.options!.whereFilter = ''; |
Contributor
There was a problem hiding this comment.
i will recommend to use .setOptions
Comment on lines
+243
to
+244
| loadPersistedState(state: Record<string, unknown>): this { | ||
| this.persistedState.setStore(state); |
Contributor
There was a problem hiding this comment.
setStore but state: Record<string, unknown>
devnaumov
previously approved these changes
Apr 20, 2026
…https://github.com/dbeaver/cloudbeaver into 7562-cb-keep-data-editor-filter-state-during-session
devnaumov
approved these changes
Apr 22, 2026
devnaumov
deleted the
7562-cb-keep-data-editor-filter-state-during-session
branch
April 22, 2026 12:53
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.